Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add HTTP server and JSON API #659

Closed
wants to merge 834 commits into from
Closed

Add HTTP server and JSON API #659

wants to merge 834 commits into from

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 21, 2019 •
edited
Loading

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10

This PR adds a fully-fledged HTTP server and JSON API to FTL.
It will replace lighttpd and serve both the API and the next-gen web interface.

More detail is to be added here once this feature advances further.

@DL6ER DL6ER force-pushed the new/http branch 2 times, most recently from 73072e4 to 38abfff Compare December 3, 2019 12:28
@DL6ER DL6ER added this to the v6.0 milestone Dec 20, 2019
@DL6ER DL6ER force-pushed the new/http branch 2 times, most recently from 6fcce6d to 586fee1 Compare December 25, 2019 16:41
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/make-some-advance-api/26786/2

@PromoFaux PromoFaux mentioned this pull request Apr 15, 2020
Closed
@joshspicer joshspicer mentioned this pull request May 4, 2020
Open
This was referenced May 13, 2020
Closed
Closed
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/black-whitelisting-does-not-work-on-v5-api/33119/1

@sterrenb sterrenb mentioned this pull request May 22, 2020
Closed
@DL6ER
Copy link
Member Author

DL6ER commented May 26, 2020

We're still following this. I just rebased it onto the latest development branch.

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/php-webscripts/31016/28

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/php-webscripts/31016/32

@DL6ER
Copy link
Member Author

DL6ER commented May 28, 2020

This branch can now host the web interface. Many things will not work as we removed the rusty telnet interface and added a React-based API in this version of FTL. This will have to be adapted for the current API. Eventually, we will be able to get rid of api.php and siblings and have all JS scripts directly talking to FTL.

However, pages not directly depending on the interactive API do already work.

For instance:

Screenshot at 2020-05-29 00-14-58
Screenshot at 2020-05-29 00-20-25

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/php-webscripts/31016/35

@DL6ER DL6ER mentioned this pull request Jun 13, 2020
Closed
3 tasks
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/how-to-update-dhcp-with-api/34773/1

@sterrenb sterrenb mentioned this pull request Sep 10, 2020
Open
@DL6ER DL6ER force-pushed the new/http branch 3 times, most recently from 429922b to 0abcc24 Compare October 26, 2020 11:39
@davidhessler
Copy link

Is there a rough date when this is going to merge?

@jojost1
Copy link

jojost1 commented Nov 16, 2020

To add to that: will the old API still exist?

@dschaper
Copy link
Member

Is there a rough date when this is going to merge?

When it's ready.

To add to that: will the old API still exist?

Which API are you referring to? There are a few different things that people call an API.

@DL6ER DL6ER marked this pull request as ready for review June 10, 2023 11:04
@DL6ER DL6ER requested a review from a team June 10, 2023 11:04
@DL6ER
Copy link
Member Author

DL6ER commented Jun 10, 2023

Switching this to ready for review + merge to development. You can ignore the old builder jobs still marked as required here. We can change them when they landed in development

yubiuser
yubiuser previously approved these changes Jun 10, 2023
View reviewed changes
DL6ER added 12 commits June 14, 2023 15:13
@DL6ER
Rename default theme to auto theme
5e8525e 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add high-contrast themes to list of available themes)
0002399 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Save number of ABP-style entries in adlist table's new column abp_ent…
07f1f7d 
…ries

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Pass new abp_entries number to API
9f808b9 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Spell-check fixes (RFC 6891 uses requestor with o so I assume this is…
16d43a5 
… a valid word)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
There is a certain level of arbitrariness in how spell-check works ..…
3e10f67 
…. and behaves different when running locally (act -j spell-check) and online (GHA)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add pihole-fTL gravity checkList <file> option
b2ad7af 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Allow defining lines to inject into the generated dnsmasq configurati…
73f9ad0 
…on (misc.dnsmasq_lines)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add enum values for high-cotnrast theme family
61931f9 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add support for IPv6-only nameserver system configurations
3dcbaf7 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Also backup and restore IPv6 ports
85c797a 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Fix config output on CLI and add tests for it
d71e174 
Signed-off-by: DL6ER <[email protected]>
@mix3d mix3d mentioned this pull request Jun 18, 2023
Open
@PromoFaux PromoFaux closed this Jun 20, 2023
@PromoFaux PromoFaux deleted the new/http branch June 20, 2023 18:36
@PromoFaux
Copy link
Member

development continues in development-v6 branch

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-v6-beta-testing/65413/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser left review comments

Assignees
No one assigned
Labels
Breaking change Enhancement
Projects
None yet
Milestone
v6.0
Development

Successfully merging this pull request may close these issues.